docs: Add GtkPopoverMenu to the widget gallery

diff --git a/docs/reference/gtk/images/menu.png b/docs/reference/gtk/images/menu.png
new file mode 100644 (file)
index 0000000..d6096a5
Binary files /dev/null and b/docs/reference/gtk/images/menu.png differ

diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 4ccd9c4e01762bfc507231fffa1552c84625797e..8b2a8115d39accdbb2a83a95d56cd8c3e52983e9 100644 (file)
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -327,6 +327,7 @@ images = [
   'images/lockbutton-sorry.png',
   'images/lockbutton-unlocked.png',
   'images/media-controls.png',
+  'images/menu.png',
   'images/menubar.png',
   'images/menu-button.png',
   'images/messagedialog.png',

diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 9c5e368c49878930833442c0577a239bad610a28..bac57788abc2a071654449068698ac6500fe472b 100644 (file)
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -24,7 +24,8 @@
     <link linkend="GtkMediaControls"><inlinegraphic fileref="media-controls.png" format="PNG"></inlinegraphic></link>
     <link linkend="GtkWindowControls"><inlinegraphic fileref="windowcontrols.png" format="PNG"></inlinegraphic></link>
     <link linkend="GtkEmojiChooser"><inlinegraphic fileref="emojichooser.png" format="PNG"></inlinegraphic></link>
-    <link linkend="GtkPopoverMenu"><inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkPopoverMenu"><inlinegraphic fileref="menu.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkPopoverMenuBar"><inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic></link>
   </para>
 </section>
 

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 6a5ac3f18f0210232c7897f545588cf72222bf28..6500291b0a0d32cb49b42ae702d22a62d804c4b1 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -1663,6 +1663,69 @@ create_popover (void)
   return info;
 }
 
+static WidgetInfo *
+create_menu (void)
+{
+  GtkWidget *widget;
+  GMenu *menu, *menu1;
+  GMenuItem *item;
+  GSimpleActionGroup *group;
+  GSimpleAction *action;
+  GtkEventController *controller;
+  GtkShortcut *shortcut;
+
+  menu = g_menu_new ();
+  menu1 = g_menu_new ();
+  item = g_menu_item_new ("Item", "action");
+  g_menu_append_item (menu1, item);
+  g_menu_append_submenu (menu, "Style", G_MENU_MODEL (menu1));
+  g_object_unref (item);
+  g_object_unref (menu1);
+  item = g_menu_item_new ("Transition", "menu.transition");
+  g_menu_append_item (menu, item);
+  g_object_unref (item);
+
+  menu1 = g_menu_new ();
+  item = g_menu_item_new ("Inspector", "menu.inspector");
+  g_menu_append_item (menu1, item);
+  g_object_unref (item);
+  item = g_menu_item_new ("About", "menu.about");
+  g_menu_append_item (menu1, item);
+  g_object_unref (item);
+  g_menu_append_section (menu, NULL, G_MENU_MODEL (menu1));
+  g_object_unref (menu1);
+
+  widget = gtk_popover_menu_new_from_model (G_MENU_MODEL (menu));
+
+  g_object_unref (menu);
+
+  group = g_simple_action_group_new ();
+  action = g_simple_action_new_stateful ("transition", NULL, g_variant_new_boolean (TRUE));
+  g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action));
+  g_object_unref (action);
+  action = g_simple_action_new ("inspector", NULL);
+  g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action));
+  g_object_unref (action);
+  action = g_simple_action_new ("about", NULL);
+  g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action));
+  g_object_unref (action);
+
+  gtk_widget_insert_action_group (widget, "menu", G_ACTION_GROUP (group));
+
+  g_object_unref (group);
+
+  g_object_set (widget, "autohide", FALSE, NULL);
+
+  controller = gtk_shortcut_controller_new ();
+  shortcut = gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_F1, 0),
+                               gtk_named_action_new ("menu.about"));
+  gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), shortcut);
+
+  gtk_widget_add_controller (widget, controller);
+
+  return new_widget_info ("menu", widget, ASIS);
+}
+
 GList *
 get_all_widgets (void)
 {
@@ -1734,6 +1797,7 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_expander ());
   retval = g_list_prepend (retval, create_menu_bar ());
   retval = g_list_prepend (retval, create_popover ());
+  retval = g_list_prepend (retval, create_menu ());
 
   return retval;
 }